luci-base: luci.js: fix undefined "this" when /ubus/ is unavailable

Fixes: #2850
Fixes: 66dfe64ca ("luci-base: luci.js: cache determined RPC base url in session storage")
Signed-off-by: Jo-Philipp Wich <[email protected]>

diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 3e40b304b61c4cafebb36ce635dd55ab67bf087a..1f883ab80244c53f36b66b0e8ae6536f8f0f1db1 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -762,10 +762,12 @@
                        }
 
                        if (rpcBaseURL == null) {
+                               var rpcFallbackURL = this.url('admin/ubus');
+
                                rpcBaseURL = Request.get('/ubus/').then(function(res) {
-                                       return (rpcBaseURL = (res.status == 400) ? '/ubus/' : this.url('admin/ubus'));
+                                       return (rpcBaseURL = (res.status == 400) ? '/ubus/' : rpcFallbackURL);
                                }, function() {
-                                       return (rpcBaseURL = L.url('admin/ubus'));
+                                       return (rpcBaseURL = rpcFallbackURL);
                                }).then(function(url) {
                                        try {
                                                window.sessionStorage.setItem('rpcBaseURL', url);